Autogenerated HTML docs for v1.9-rc0
diff --git a/gitcvs-migration.html b/gitcvs-migration.html index c7834cc..3efd165 100644 --- a/gitcvs-migration.html +++ b/gitcvs-migration.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.6.8" /> +<meta name="generator" content="AsciiDoc 8.6.6" /> <title>gitcvs-migration(7)</title> <style type="text/css"> /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ @@ -87,15 +87,11 @@ ul > li { color: #aaa; } ul > li > * { color: black; } -.monospaced, code, pre { - font-family: "Courier New", Courier, monospace; - font-size: inherit; - color: navy; +pre { padding: 0; margin: 0; } - #author { color: #527bbd; font-weight: bold; @@ -353,7 +349,7 @@ margin-bottom: 0.1em; } -div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { margin-top: 0; margin-bottom: 0; } @@ -411,14 +407,18 @@ span.overline { text-decoration: overline; } span.line-through { text-decoration: line-through; } -div.unbreakable { page-break-inside: avoid; } - /* * xhtml11 specific * * */ +tt { + font-family: monospace; + font-size: inherit; + color: navy; +} + div.tableblock { margin-top: 1.0em; margin-bottom: 1.5em; @@ -452,6 +452,12 @@ * * */ +.monospaced { + font-family: monospace; + font-size: inherit; + color: navy; +} + table.tableblock { margin-top: 1.0em; margin-bottom: 1.5em; @@ -531,8 +537,6 @@ @media print { body.manpage div#toc { display: none; } } - - </style> <script type="text/javascript"> /*<+'])'); + var re = new RegExp('[hH]([2-'+(toclevels+1)+'])'); // Function that scans the DOM tree for header elements (the DOM2 // nodeIterator API would be a better technique but not supported by all // browsers). @@ -606,7 +610,7 @@ var i; for (i = 0; i < toc.childNodes.length; i++) { var entry = toc.childNodes[i]; - if (entry.nodeName.toLowerCase() == 'div' + if (entry.nodeName == 'div' && entry.getAttribute("class") && entry.getAttribute("class").match(/^toclevel/)) tocEntriesToRemove.push(entry); @@ -652,7 +656,7 @@ var entriesToRemove = []; for (i = 0; i < noteholder.childNodes.length; i++) { var entry = noteholder.childNodes[i]; - if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote") + if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote") entriesToRemove.push(entry); } for (i = 0; i < entriesToRemove.length; i++) { @@ -772,13 +776,13 @@ repository over ssh with:</p></div> <div class="listingblock"> <div class="content"> -<pre><code>$ git clone foo.com:/pub/repo.git/ my-project -$ cd my-project</code></pre> +<pre><tt>$ git clone foo.com:/pub/repo.git/ my-project +$ cd my-project</tt></pre> </div></div> <div class="paragraph"><p>and hack away. The equivalent of <em>cvs update</em> is</p></div> <div class="listingblock"> <div class="content"> -<pre><code>$ git pull origin</code></pre> +<pre><tt>$ git pull origin</tt></pre> </div></div> <div class="paragraph"><p>which merges in any work that others might have done since the clone operation. If there are uncommitted changes in your working tree, commit @@ -791,7 +795,7 @@ <td class="content"> <div class="paragraph"><p>The <em>pull</em> command knows where to get updates from because of certain configuration variables that were set by the first <em>git clone</em> -command; see <code>git config -l</code> and the <a href="git-config.html">git-config(1)</a> man +command; see <tt>git config -l</tt> and the <a href="git-config.html">git-config(1)</a> man page for details.</p></div> </td> </tr></table> @@ -800,23 +804,23 @@ your changes, and then using the <em>git push</em> command:</p></div> <div class="listingblock"> <div class="content"> -<pre><code>$ git push origin master</code></pre> +<pre><tt>$ git push origin master</tt></pre> </div></div> <div class="paragraph"><p>to "push" those commits to the shared repository. If someone else has updated the repository more recently, <em>git push</em>, like <em>cvs commit</em>, will complain, in which case you must pull any changes before attempting the push again.</p></div> <div class="paragraph"><p>In the <em>git push</em> command above we specify the name of the remote branch -to update (<code>master</code>). If we leave that out, <em>git push</em> tries to update +to update (<tt>master</tt>). If we leave that out, <em>git push</em> tries to update any branches in the remote repository that have the same name as a branch in the local repository. So the last <em>push</em> can be done with either of:</p></div> <div class="listingblock"> <div class="content"> -<pre><code>$ git push origin -$ git push foo.com:/pub/project.git/</code></pre> +<pre><tt>$ git push origin +$ git push foo.com:/pub/project.git/</tt></pre> </div></div> <div class="paragraph"><p>as long as the shared repository does not have any branches -other than <code>master</code>.</p></div> +other than <tt>master</tt>.</p></div> </div> </div> <div class="sect1"> @@ -831,10 +835,10 @@ it:</p></div> <div class="listingblock"> <div class="content"> -<pre><code>$ mkdir /pub/my-repo.git +<pre><tt>$ mkdir /pub/my-repo.git $ cd /pub/my-repo.git $ git --bare init --shared -$ git --bare fetch /home/alice/myproject master:master</code></pre> +$ git --bare fetch /home/alice/myproject master:master</tt></pre> </div></div> <div class="paragraph"><p>Next, give every team member read/write access to this repository. One easy way to do this is to give all the team members ssh access to the @@ -845,7 +849,7 @@ writable by that group:</p></div> <div class="listingblock"> <div class="content"> -<pre><code>$ chgrp -R $group /pub/my-repo.git</code></pre> +<pre><tt>$ chgrp -R $group /pub/my-repo.git</tt></pre> </div></div> <div class="paragraph"><p>Make sure committers have a umask of at most 027, so that the directories they create are writable and searchable by other group members.</p></div> @@ -860,7 +864,7 @@ of the project you are interested in and run <a href="git-cvsimport.html">git-cvsimport(1)</a>:</p></div> <div class="listingblock"> <div class="content"> -<pre><code>$ git cvsimport -C <destination> <module></code></pre> +<pre><tt>$ git cvsimport -C <destination> <module></tt></pre> </div></div> <div class="paragraph"><p>This puts a Git archive of the named CVS module in the directory <destination>, which will be created if necessary.</p></div> @@ -868,9 +872,9 @@ cvsimport can average some twenty revisions per second, so for a medium-sized project this should not take more than a couple of minutes. Larger projects or remote repositories may take longer.</p></div> -<div class="paragraph"><p>The main trunk is stored in the Git branch named <code>origin</code>, and additional +<div class="paragraph"><p>The main trunk is stored in the Git branch named <tt>origin</tt>, and additional CVS branches are stored in Git branches with the same names. The most -recent version of the main trunk is also left checked out on the <code>master</code> +recent version of the main trunk is also left checked out on the <tt>master</tt> branch, so you can start adding your own changes right away.</p></div> <div class="paragraph"><p>The import is incremental, so if you call it again next month it will fetch any CVS updates that have been made in the meantime. For this to 